Skip to content

Fixed annotations #18946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Nov 5, 2018
Merged

Fixed annotations #18946

merged 3 commits into from
Nov 5, 2018

Conversation

sreichel
Copy link
Contributor

@sreichel sreichel commented Oct 30, 2018 •
edited
Loading

Description (*)

Fixed someannotations that code analysation had complained about:

  1. Magento\Catalog\Model\ResourceModel\Product\Collection::addAttributeToFilter()

array is a valid input type for addAttributeToFilter()

  1. Magento\Quote\Model\QuoteAddress::setCollectShippingRates()

Everywhere in code setCollectShippingRates() uses true as parameter, but annotation wants an integer.

  1. Magento\Customer\Model\Address\AbstractAddress::getCountry()

getCountryId() and getCountry() returns a string, not an integer

m2-countryid

  1. setData() returns \Magento\Framework\DataObject instead of $this

Fixed Issues (if relevant)

  1. n/a

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

@sreichel
Fixed annotations
fbca4dd 
- Magento\Catalog\Model\ResourceModel\Product\Collection::addAttributeToFilter()
- Magento\Quote\Model\QuoteAddress::setCollectShippingRates()
@magento-engcom-team
Copy link
Contributor

Hi @sreichel. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento-engcom-team give me test instance - deploy test instance based on PR changes
  • @magento-engcom-team give me $VERSION instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

@sreichel sreichel requested a review from ihor-sviziev October 30, 2018 10:27
@VladimirZaets VladimirZaets self-assigned this Oct 30, 2018
@magento-engcom-team magento-engcom-team added this to the Release: 2.3.1 milestone Oct 30, 2018
@magento-engcom-team
Copy link
Contributor

Hi @VladimirZaets, thank you for the review.
ENGCOM-3331 has been created to process this Pull Request

@ihor-sviziev ihor-sviziev removed their request for review October 30, 2018 12:30
@sreichel
Fixed annotations
2f5fc97 
- Magento\Customer\Model\Address\AbstractAddress::getCountry()
- Magento\Customer\Model\Address\AbstractAddress::getCountryId()
@sreichel
Fixed annotations for setData()
23ad12a 
setData() should return objects class - that inherits from
@magento-engcom-team magento-engcom-team merged commit 23ad12a into magento:2.3-develop Nov 5, 2018
magento-engcom-team pushed a commit that referenced this pull request Nov 5, 2018
ENGCOM-3331: Fixed annotations #18946
7780df5
@magento-engcom-team
Copy link
Contributor

Hi @sreichel. Thank you for your contribution.
We will aim to release these changes as part of 2.3.1.
Please check the release notes for final confirmation.

@sreichel sreichel deleted the develop/fix/annotation-1 branch November 15, 2018 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VladimirZaets VladimirZaets VladimirZaets approved these changes

Assignees

@VladimirZaets VladimirZaets

Labels
Cleanup Component: Catalog Component: Customer Component: Quote Component: Sales Component: Widget Progress: accept Release Line: 2.3
Projects
None yet
Milestone
Release: 2.3.1
Development

Successfully merging this pull request may close these issues.
3 participants
@sreichel @magento-engcom-team @VladimirZaets